From: Raspbian automatic forward porter <root@raspbian.org>
Date: Fri, 9 Jan 2026 16:25:03 +0000 (+0000)
Subject: Merge version 2022.1.0-1+rpi1 and 2022.1.0-1+deb13u1 to produce 2022.1.0-1+rpi1+deb13u1
X-Git-Tag: archive/raspbian/2022.1.0-1+rpi1+deb13u1^0
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=028b017e020485460a11067fc4e75c9f873312c4;p=onetbb.git

Merge version 2022.1.0-1+rpi1 and 2022.1.0-1+deb13u1 to produce 2022.1.0-1+rpi1+deb13u1
---

028b017e020485460a11067fc4e75c9f873312c4
diff --cc debian/changelog
index bb0ebc5,2ac64b4..a985f9f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,21 @@@
- onetbb (2022.1.0-1+rpi1) trixie-staging; urgency=medium
++onetbb (2022.1.0-1+rpi1+deb13u1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2021.5.0-12+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Fri, 01 Jul 2022 09:58:06 +0000]
 +  * Link against libatomic on armhf too.
 +  * Fix clean target.
 +
 +  [changes introduced in 2021.5.0-15+rpi1 by Peter Michael Green]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Sat, 12 Apr 2025 19:19:22 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 09 Jan 2026 16:25:03 +0000
++
+ onetbb (2022.1.0-1+deb13u1) trixie; urgency=medium
+ 
+   * Team upload.
+   * Skip some tests when the machine has a single CPU. Closes: #1108053.
+   * Skip test_mutex, it fails in Salsa CI. Closes: #1094260.
+ 
+  -- Santiago Vila <sanvila@debian.org>  Sun, 28 Sep 2025 18:50:00 +0200
  
  onetbb (2022.1.0-1) unstable; urgency=medium